From cbe5948eb7e07c1a8a7389d0cdc89ff77c24f745 Mon Sep 17 00:00:00 2001
From: "mjw@wray-m-3.hpl.hp.com" <mjw@wray-m-3.hpl.hp.com>
Date: Mon, 28 Jun 2004 15:38:10 +0000
Subject: [PATCH] bitkeeper revision 1.1010.1.14
 (40e03b62fW40sc6EpkeVtIAfp2wE-w)

Fix includes.
---
 tools/lib/gzip_stream.c | 16 +---------------
 tools/lib/gzip_stream.h |  2 --
 tools/misc/Makefile     |  1 +
 tools/xc/lib/xc_io.h    |  2 +-
 tools/xentrace/Makefile |  1 +
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/tools/lib/gzip_stream.c b/tools/lib/gzip_stream.c
index 1e67b4d7d7..af46023f9d 100644
--- a/tools/lib/gzip_stream.c
+++ b/tools/lib/gzip_stream.c
@@ -28,8 +28,6 @@
 
 #include "zlib.h"
 
-extern FILE* gzfile(gzFile file);
-
 #include "allocate.h"
 #include "gzip_stream.h"
 
@@ -59,18 +57,6 @@ static inline gzFile get_gzfile(IOStream *s){
     return (gzFile)s->data;
 }
 
-/** Control buffering on the underlying stream, like setvbuf().
- *
- * @param io gzip stream
- * @param buf buffer
- * @param mode buffering mode (see man setvbuf())
- * @param size buffer size
- * @return 0 on success, non-zero otherwise
- */
-int gzip_stream_setvbuf(IOStream *io, char *buf, int mode, size_t size){
-    return setvbuf(gzfile(get_gzfile(io)), buf, mode, size);
-}
-
 /** Write to the underlying stream.
  *
  * @param stream destination
@@ -113,7 +99,7 @@ static int gzip_error(IOStream *s){
     int err;
     gzFile *gz = get_gzfile(s);
     gzerror(gz, &err);
-    return (err == Z_ERRNO ? ferror(gzfile(gz)) : err);
+    return (err == Z_ERRNO ? 1 /* ferror(gzfile(gz)) */ : err);
 }
 
 /** Close a gzip stream.
diff --git a/tools/lib/gzip_stream.h b/tools/lib/gzip_stream.h
index 63acb8cf1b..cf76d25275 100644
--- a/tools/lib/gzip_stream.h
+++ b/tools/lib/gzip_stream.h
@@ -27,7 +27,5 @@
 extern IOStream *gzip_stream_new(gzFile *f);
 extern IOStream *gzip_stream_fopen(const char *file, const char *flags);
 extern IOStream *gzip_stream_fdopen(int fd, const char *flags);
-
-extern int gzip_stream_setvbuf(IOStream *io, char *buf, int mode, size_t size);
 #endif
 #endif /* !_SP_FILE_STREAM_H_ */
diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index 69651f2152..9891676d5a 100644
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -4,6 +4,7 @@ CFLAGS     = -Wall -O3
 EXTRA_INC  = -I../../xen/include/hypervisor-ifs
 EXTRA_INC += -I../../linux-xen-sparse/include -I../xc/lib
 EXTRA_INC += -I../xu/lib
+EXTRA_INC += -I../lib
 
 HDRS     = $(wildcard *.h)
 SRCS     = $(wildcard *.c)
diff --git a/tools/xc/lib/xc_io.h b/tools/xc/lib/xc_io.h
index 7a23cb91ae..37febb52f1 100644
--- a/tools/xc/lib/xc_io.h
+++ b/tools/xc/lib/xc_io.h
@@ -2,7 +2,7 @@
 #define __XC_XC_IO_H__
 
 #include "xc_private.h"
-#include <iostream.h>
+#include "iostream.h"
 
 typedef struct XcIOContext {
     u32 domain;
diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index cce1150b16..f4319be6ed 100644
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -4,6 +4,7 @@ CFLAGS   = -Wall -O3 -Werror
 CFLAGS  += -I../../xen/include/hypervisor-ifs
 CFLAGS  += -I../../linux-xen-sparse/include
 CFLAGS  += -I../xu/lib
+CFLAGS  += -I../lib
 
 HDRS     = $(wildcard *.h)
 OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))
-- 
2.30.2